python-twisted: Update to 25.5.0

This update fixes CVE-2024-41810 and CVE-2024-41671 [1]. For the full
changelog see NEWS [2].

Additionally changed the way the test files are omitted from patch file
to filespec in the Makefile.

[1] https://github.com/twisted/twisted/blob/twisted-25.5.0/NEWS.rst#twisted-2470-2024-08-08
[2] https://github.com/twisted/twisted/blob/twisted-25.5.0/NEWS.rst

Signed-off-by: Richard Muzik <[email protected]>

diff --git a/lang/python/python-twisted/Makefile b/lang/python/python-twisted/Makefile
index 79f2f2a237af8a8b4165540b15d6b698980ba3e6..a9aee66dc57cc7cd07cc0f202c7320b1b7aa150e 100644 (file)
--- a/lang/python/python-twisted/Makefile
+++ b/lang/python/python-twisted/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-twisted
-PKG_VERSION:=23.10.0
+PKG_VERSION:=25.5.0
 PKG_RELEASE:=1
 
 PYPI_NAME:=Twisted
 PYPI_SOURCE_NAME:=twisted
-PKG_HASH:=987847a0790a2c597197613686e2784fd54167df3a55d0fb17c8412305d76ce5
+PKG_HASH:=1deb272358cb6be1e3e8fc6f9c8b36f78eb0fa7c2233d2dbe11ec6fee04ea316
 
 PKG_BUILD_DEPENDS:=libtirpc
 
@@ -61,6 +61,7 @@ endef
 define Py3Package/python3-twisted/filespec
 +|$(PYTHON3_PKG_DIR)
 -|$(PYTHON3_PKG_DIR)/twisted/conch/scripts/tkconch.py
+-|$(PYTHON3_PKG_DIR)/twisted/test
 endef
 
 define Py3Package/python3-twisted/install

diff --git a/lang/python/python-twisted/patches/001-omit-tkconch.patch b/lang/python/python-twisted/patches/001-omit-tkconch.patch
index d9ad0d59e2178b8cf096a5a02d983c7c880108f8..454a8bc61220eacb3d77ea49f45c43ae09fd6bdf 100644 (file)
--- a/lang/python/python-twisted/patches/001-omit-tkconch.patch
+++ b/lang/python/python-twisted/patches/001-omit-tkconch.patch
@@ -1,6 +1,6 @@
 --- a/pyproject.toml
 +++ b/pyproject.toml
-@@ -138,7 +138,6 @@ ckeygen = "twisted.conch.scripts.ckeygen
+@@ -148,7 +148,6 @@ ckeygen = "twisted.conch.scripts.ckeygen
  conch = "twisted.conch.scripts.conch:run"
  mailmail = "twisted.mail.scripts.mailmail:run"
  pyhtmlizer = "twisted.scripts.htmlizer:run"

diff --git a/lang/python/python-twisted/patches/002-omit-tests.patch b/lang/python/python-twisted/patches/002-omit-tests.patch
deleted file mode 100644 (file)
index ddf8f9e..0000000
--- a/lang/python/python-twisted/patches/002-omit-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -182,6 +182,7 @@ exclude = [
-     "*.pxi",
-     "*.pyx",
-     "build.bat",
-+    "test",
- ]
- 
- [tool.hatch.build.targets.sdist]